From dc9f63ebe37be76801ac65f996ff2d44514d5e5a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Wed, 1 May 2024 04:22:29 +0200
Subject: [PATCH] tray: Zero-initialize the event structures on initialization

Origin: https://gitlab.gnome.org/3v1n0/gnome-shell/-/commits/tray-offscreen-xwindows
Bug-Ubuntu: https://bugs.launchpad.net/bugs/2012388

Gbp-Pq: Topic tray-icons
Gbp-Pq: Name tray-Zero-initialize-the-event-structures-on-initializati.patch
---
 src/tray/na-tray-child.c | 6 +++---
 src/tray/na-xembed.c     | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/tray/na-tray-child.c b/src/tray/na-tray-child.c
index 091199574..9ec667033 100644
--- a/src/tray/na-tray-child.c
+++ b/src/tray/na-tray-child.c
@@ -260,9 +260,9 @@ na_tray_child_emulate_event (NaTrayChild *tray_child,
                              ClutterEvent *event)
 {
   MetaX11Display *x11_display;
-  XKeyEvent xkevent;
-  XButtonEvent xbevent;
-  XCrossingEvent xcevent;
+  XKeyEvent xkevent = {0};
+  XButtonEvent xbevent = {0};
+  XCrossingEvent xcevent = {0};
   Display *xdisplay;
   Window xwindow, xrootwindow;
   ClutterEventType event_type = clutter_event_type (event);
diff --git a/src/tray/na-xembed.c b/src/tray/na-xembed.c
index 116cb8a19..408832221 100644
--- a/src/tray/na-xembed.c
+++ b/src/tray/na-xembed.c
@@ -115,9 +115,8 @@ xembed_send_message (NaXembed          *xembed,
 {
   NaXembedPrivate *priv = na_xembed_get_instance_private (xembed);
   Display *xdisplay = meta_x11_display_get_xdisplay (priv->x11_display);
-  XClientMessageEvent xclient;
+  XClientMessageEvent xclient = {0};
 
-  memset (&xclient, 0, sizeof (xclient));
   xclient.window = recipient;
   xclient.type = ClientMessage;
   xclient.message_type = priv->atom__XEMBED;
@@ -153,10 +152,9 @@ static void
 na_xembed_send_configure_event (NaXembed *xembed)
 {
   NaXembedPrivate *priv = na_xembed_get_instance_private (xembed);
-  XConfigureEvent xconfigure;
+  XConfigureEvent xconfigure = {0};
   Display *xdisplay = meta_x11_display_get_xdisplay (priv->x11_display);
 
-  memset (&xconfigure, 0, sizeof (xconfigure));
   xconfigure.type = ConfigureNotify;
 
   xconfigure.event = priv->plug_window;
-- 
2.39.5